+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
+Wed Mar 17 02:49:32 1999 Tim Janik <timj@gtk.org>
+
+ * configure.in: build gtkcompat.h from gtkcompat.h.in instead of
+ gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0.
+
+ * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this
+ file. strongly deprecated the GTK_HAVE_* macros, we provide
+ GTK_CHECK_VERSION() for people that need to check for certain
+ Gtk+ versions.
+
+ * gtk/gtkcompat.h: removed this from CVS.
+ * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad
+ idea right from the start, it just didn't seem like that back then.
+
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
if test x$with_glib = x ; then
# Look for separately installed glib
- AM_PATH_GLIB(1.2.0,,
+ AM_PATH_GLIB(1.3.0,,
AC_MSG_ERROR([
-*** GLIB 1.2.0 or better is required. The latest version of GLIB
+*** GLIB 1.3.0 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org/.]),
gmodule gthread)
docs/Makefile
gdk/Makefile
gtk/Makefile
-gtk/gtkfeatures.h
+gtk/gtkcompat.h
], [chmod +x gtk-config])
testrgb
simple
testtree
-gtkfeatures.h
+gtkcompat.h
testthreads
libgtk.la
gtkmarshal.h
gtkclist.h \
gtkcolorsel.h \
gtkcombo.h \
- gtkcompat.h \
gtkcontainer.h \
gtkctree.h \
gtkcurve.h \
gtkinclude_HEADERS = \
$(source_headers) \
- gtkfeatures.h \
+ gtkcompat.h \
gtkmarshal.h \
gtktypebuiltins.h
testgtk.1 \
testgtkrc \
testgtkrc2 \
- gtkfeatures.h.in \
+ gtkcompat.h.in \
makeenums.pl \
makeenums.awk \
maketypes.awk \
#include <gtk/gtkentry.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkeventbox.h>
-#include <gtk/gtkfeatures.h>
#include <gtk/gtkfilesel.h>
#include <gtk/gtkfixed.h>
#include <gtk/gtkfontsel.h>
+++ /dev/null
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
- * file for a list of people on the GTK+ Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_COMPAT_H__
-#define __GTK_COMPAT_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* this file contains aliases that have to be kept for historical
- * reasons, because a wide code base depends on them.
- */
-
-#ifndef GTK_DISABLE_COMPAT_H
-
-#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width
-#define gtk_container_border_width gtk_container_set_border_width
-#define gtk_notebook_current_page gtk_notebook_get_current_page
-#define gtk_packer_configure gtk_packer_set_child_packing
-#define gtk_paned_gutter_size gtk_paned_set_gutter_size
-#define gtk_paned_handle_size gtk_paned_set_handle_size
-#define gtk_scale_value_width gtk_scale_get_value_width
-#define gtk_window_position gtk_window_set_position
-#define gtk_toggle_button_set_state gtk_toggle_button_set_active
-#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
-
-/* strongly deprecated: */
-#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r))
-#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) \
- gtk_style_apply_default_background (s,gw,TRUE,st,a,x,y,w,h)
-
-#endif /* GTK_DISABLE_COMPAT_H */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_COMPAT_H__ */
--- /dev/null
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_COMPAT_H__
+#define __GTK_COMPAT_H__
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* compile time version
+ */
+#define GTK_MAJOR_VERSION (@GTK_MAJOR_VERSION@)
+#define GTK_MINOR_VERSION (@GTK_MINOR_VERSION@)
+#define GTK_MICRO_VERSION (@GTK_MICRO_VERSION@)
+#define GTK_BINARY_AGE (@GTK_BINARY_AGE@)
+#define GTK_INTERFACE_AGE (@GTK_INTERFACE_AGE@)
+
+/* check whether a Gtk+ version equal to or greater than
+ * major.minor.micro is present.
+ */
+#define GTK_CHECK_VERSION(major,minor,micro) \
+ (GTK_MAJOR_VERSION > (major) || \
+ (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
+ (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
+ GTK_MICRO_VERSION >= (micro)))
+
+
+/* use -DGTK_DISABLE_COMPAT_H to compile your code and asure that it
+ * works with future Gtk+ versions as well.
+ */
+#ifndef GTK_DISABLE_COMPAT_H
+
+/* the following are aliases that have to be kept for historical
+ * reasons, because a wide code base depends on them. it is not
+ * recommended to actually make use of these definitions.
+ */
+#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width
+#define gtk_container_border_width gtk_container_set_border_width
+#define gtk_notebook_current_page gtk_notebook_get_current_page
+#define gtk_packer_configure gtk_packer_set_child_packing
+#define gtk_paned_gutter_size gtk_paned_set_gutter_size
+#define gtk_paned_handle_size gtk_paned_set_handle_size
+#define gtk_scale_value_width gtk_scale_get_value_width
+#define gtk_window_position gtk_window_set_position
+#define gtk_toggle_button_set_state gtk_toggle_button_set_active
+#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
+
+
+/* strongly deprecated, very likely to be removed in the future:
+ */
+#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r))
+#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
+#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
+#define GTK_HAVE_SIGNAL_INIT 1-0-2
+#define GTK_HAVE_FEATURES_1_1_0 1-1-0
+#define GTK_HAVE_FEATURES_1_1_2 1-1-2
+#define GTK_HAVE_FEATURES_1_1_4 1-1-4
+#define GTK_HAVE_FEATURES_1_1_5 1-1-5
+#define GTK_HAVE_FEATURES_1_1_6 1-1-6
+#define GTK_HAVE_FEATURES_1_1_7 1-1-7
+#define GTK_HAVE_FEATURES_1_1_8 1-1-8
+#define GTK_HAVE_FEATURES_1_1_9 1-1-9
+#define GTK_HAVE_FEATURES_1_1_10 1-1-10
+#define GTK_HAVE_FEATURES_1_1_11 1-1-11
+#define GTK_HAVE_FEATURES_1_1_12 1-1-12
+#define GTK_HAVE_FEATURES_1_1_13 1-1-13
+#define GTK_HAVE_FEATURES_1_1_14 1-1-14
+
+
+#endif /* GTK_DISABLE_COMPAT_H */
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __GTK_COMPAT_H__ */
+++ /dev/null
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GTK_FEATURES_H__
-#define __GTK_FEATURES_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* compile time version
- */
-#define GTK_MAJOR_VERSION (@GTK_MAJOR_VERSION@)
-#define GTK_MINOR_VERSION (@GTK_MINOR_VERSION@)
-#define GTK_MICRO_VERSION (@GTK_MICRO_VERSION@)
-#define GTK_BINARY_AGE (@GTK_BINARY_AGE@)
-#define GTK_INTERFACE_AGE (@GTK_INTERFACE_AGE@)
-#define GTK_CHECK_VERSION(major,minor,micro) \
- (GTK_MAJOR_VERSION > (major) || \
- (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
- (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
- GTK_MICRO_VERSION >= (micro)))
-
-
-/* new gtk_container_set_focus_[hv]adjustment()
- */
-#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
-
-/* newly exported gtk_signal_init()
- * new gtk_signal_n_emissions*()
- * "signal-name" is now an alias for "signal_name"
- * new gtk_signal_emitv*()
- */
-#define GTK_HAVE_SIGNAL_INIT 1-0-2
-
-/* Gtk+ 1.1.0 version tag.
- * - new gtk_rc_set_image_loader () to install custom image loaders for rc
- * files.
- * - GtkAccel groups replaced GtkAcceleratorTables
- * - Gdk supports full crossing event now.
- * - Buttons featur relief styles now.
- * - gdk_rgb_*() functions are in place.
- * - stringified enum values can be queried for enum types now.
- * - new key binding system is in place (GtkBindingSet).
- * - simple algorithm for pattern matching is exported now (GtkPatternSpec).
- */
-#define GTK_HAVE_FEATURES_1_1_0 1-1-0
-
-/* Gtk+ 1.1.2 version tag
- * - ctree function name changes
- */
-#define GTK_HAVE_FEATURES_1_1_2 1-1-2
-
-/* Gtk+ 1.1.4 version tag
- * - clist v/hscrollbar -> v/hadjustment changes
- */
-#define GTK_HAVE_FEATURES_1_1_4 1-1-4
-
-/* Gtk+ 1.1.5 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_5 1-1-5
-
-/* Gtk+ 1.1.6 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_6 1-1-6
-
-/* Gtk+ 1.1.7 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_7 1-1-7
-
-/* Gtk+ 1.1.8 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_8 1-1-8
-
-/* Gtk+ 1.1.9 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_9 1-1-9
-
-/* Gtk+ 1.1.10 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_10 1-1-10
-
-/* Gtk+ 1.1.11 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_11 1-1-11
-
-/* Gtk+ 1.1.12 version tag
- */
-#define GTK_HAVE_FEATURES_1_1_12 1-1-12
-
-/* Gtk+ 1.1.13 version tag
- * gtk_toggle_button_set_state name changes
- */
-#define GTK_HAVE_FEATURES_1_1_13 1-1-13
-
-/* Gtk+ 1.1.14 version tag
- * working gtk layout, etc
- */
-#define GTK_HAVE_FEATURES_1_1_14 1-1-14
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_FEATURES_H__ */
#include <gmodule.h>
#include "gtkbutton.h"
#include "gtkdnd.h"
-#include "gtkfeatures.h"
+#include "gtkcompat.h"
#include "gtkhscrollbar.h"
#include "gtkhseparator.h"
#include "gtkmain.h"